From b7d476561875433987d2a4ffc95c32f2d96f87f4 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Tue, 23 Dec 2008 21:02:40 +0000 Subject: [PATCH] (Info-find-node-2): Use negative offset 2 instead of 1 for Info-point-loc since it is more correct in all cases. (Info-isearch-filter): Rename from `Info-isearch-filter-predicate'. Doc fix. (Info-mode): Replace `Info-isearch-filter-predicate' with `Info-isearch-filter'. --- lisp/info.el | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lisp/info.el b/lisp/info.el index f45aa41de30..c1612abee31 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -1007,7 +1007,7 @@ a case-insensitive match is tried." (delete new-history Info-history-list)))) (goto-char anchorpos)) ((numberp Info-point-loc) - (forward-line (1- Info-point-loc)) + (forward-line (- Info-point-loc 2)) (setq Info-point-loc nil)) ((stringp Info-point-loc) (Info-find-index-name Info-point-loc) @@ -1855,8 +1855,10 @@ If DIRECTION is `backward', search in the reverse direction." ;; Otherwise this variable is set after first search failure. (and isearch-nonincremental Info-current-node))) -(defun Info-isearch-filter-predicate (beg-found found) - "Skip invisible text, node header line and Tag Table node." +(defun Info-isearch-filter (beg-found found) + "Test whether the current search hit is a visible useful text. +Return non-nil if the text from BEG-FOUND to FOUND is visible +and is not in the header line or a tag table." (save-match-data (let ((backward (< found beg-found))) (not @@ -3540,7 +3542,7 @@ Advanced commands: (set (make-local-variable 'isearch-push-state-function) 'Info-isearch-push-state) (set (make-local-variable 'isearch-filter-predicate) - 'Info-isearch-filter-predicate) + 'Info-isearch-filter) (set (make-local-variable 'search-whitespace-regexp) Info-search-whitespace-regexp) (set (make-local-variable 'revert-buffer-function) -- 2.30.2